[HVM] Mask cmpxchg8b capability in cpuid for non-pae guests

This allows non-PAE NT4 kernels to boot
Signed-off-by: Tim Deegan <Tim.Deegan@xensource.com>

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 4939524128b294b043d4a06dee0b2a1f6baf5d13..68bffdb52daef64e6ba49f35448e884b15060bde 100644 (file)
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -369,8 +369,10 @@ void hvm_cpuid(unsigned int input, unsigned int *eax, unsigned int *ebx,
 #if CONFIG_PAGING_LEVELS >= 3
             if ( !v->domain->arch.hvm_domain.params[HVM_PARAM_PAE_ENABLED] )
 #endif
+            {
                 clear_bit(X86_FEATURE_PAE & 31, edx);
-
+                clear_bit(X86_FEATURE_CX8, &edx);
+            }
             clear_bit(X86_FEATURE_PSE36 & 31, edx);
         }
         else if ( input == 0x80000001 )